Update to the new pango win32 api.

2001-08-09  Alexander Larsson <alexl@redhat.com>

	* gdk/win32/gdkfont-win32.c:
	Update to the new pango win32 api.

diff --git a/ChangeLog b/ChangeLog
index 6f7cda10ece304fb79f22609a545aa316269c7da..71154565a8ef649429bdfbabe8ca6dc548cf27b9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-09  Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkfont-win32.c:
+       Update to the new pango win32 api.
+
 2001-08-08  HideToshi Tajima  <tajima@eng.sun.com>
 
        * gtk/gtkclipboard.c (request_text_received_func): ask apps for

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 6f7cda10ece304fb79f22609a545aa316269c7da..71154565a8ef649429bdfbabe8ca6dc548cf27b9 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-08-09  Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkfont-win32.c:
+       Update to the new pango win32 api.
+
 2001-08-08  HideToshi Tajima  <tajima@eng.sun.com>
 
        * gtk/gtkclipboard.c (request_text_received_func): ask apps for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 6f7cda10ece304fb79f22609a545aa316269c7da..71154565a8ef649429bdfbabe8ca6dc548cf27b9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-08-09  Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkfont-win32.c:
+       Update to the new pango win32 api.
+
 2001-08-08  HideToshi Tajima  <tajima@eng.sun.com>
 
        * gtk/gtkclipboard.c (request_text_received_func): ask apps for

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 6f7cda10ece304fb79f22609a545aa316269c7da..71154565a8ef649429bdfbabe8ca6dc548cf27b9 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-08-09  Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkfont-win32.c:
+       Update to the new pango win32 api.
+
 2001-08-08  HideToshi Tajima  <tajima@eng.sun.com>
 
        * gtk/gtkclipboard.c (request_text_received_func): ask apps for

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 6f7cda10ece304fb79f22609a545aa316269c7da..71154565a8ef649429bdfbabe8ca6dc548cf27b9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-08-09  Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkfont-win32.c:
+       Update to the new pango win32 api.
+
 2001-08-08  HideToshi Tajima  <tajima@eng.sun.com>
 
        * gtk/gtkclipboard.c (request_text_received_func): ask apps for

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 6f7cda10ece304fb79f22609a545aa316269c7da..71154565a8ef649429bdfbabe8ca6dc548cf27b9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-08-09  Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkfont-win32.c:
+       Update to the new pango win32 api.
+
 2001-08-08  HideToshi Tajima  <tajima@eng.sun.com>
 
        * gtk/gtkclipboard.c (request_text_received_func): ask apps for

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 6f7cda10ece304fb79f22609a545aa316269c7da..71154565a8ef649429bdfbabe8ca6dc548cf27b9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-08-09  Alexander Larsson <alexl@redhat.com>
+
+       * gdk/win32/gdkfont-win32.c:
+       Update to the new pango win32 api.
+
 2001-08-08  HideToshi Tajima  <tajima@eng.sun.com>
 
        * gtk/gtkclipboard.c (request_text_received_func): ask apps for

diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index 30f338859304926cea0c38634a7fa5820b4a4cf3..16056308ff2fc3f72b5fd7cb27f84eb7bdcb7af4 100644 (file)
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -1584,20 +1584,10 @@ gdk_font_from_description (PangoFontDescription *font_desc)
 
   if (font)
     {
-      gint n_subfonts;
-      PangoWin32Subfont *subfont_ids;
-
-      n_subfonts = pango_win32_list_subfonts (font, PANGO_WIN32_U_BASIC_LATIN,
-                                             &subfont_ids);
-      if (n_subfonts > 0)
-       {
-         LOGFONT *lfp =
-           pango_win32_font_subfont_logfont (font, subfont_ids[0]);
-         result = gdk_font_from_one_singlefont (gdk_font_load_logfont (lfp));
-         g_free (lfp);
-       }
-
-      g_free (subfont_ids);
+      LOGFONT *lfp =
+       pango_win32_font_logfont (font);
+      result = gdk_font_from_one_singlefont (gdk_font_load_logfont (lfp));
+      g_free (lfp);
 
       g_object_unref (G_OBJECT (font));
     }